(x_set_border_width): Fix error message to say "frame", not "window".

diff --git a/src/ChangeLog b/src/ChangeLog
index 5cfd400906dab883b47e9237f56c10c6d656c966..87805b2b4f0036b9f2a9c7343504cc35dbccca46 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,8 @@
 2006-05-13  Eli Zaretskii  <eliz@gnu.org>
 
+       * frame.c (x_set_border_width): Fix error message to say "frame",
+       not "window".
+
        * Makefile.in (SOME_MACHINE_LISP): Add fringe.elc.
 
 2006-05-12  Chong Yidong  <cyd@stupidchicken.com>

diff --git a/src/frame.c b/src/frame.c
index c08d5a6f84d327bfcdc5fb5278c6a024100b6ea7..1c3a30c9e1ce9da8f2da2765e8c42f0507d8a4d5 100644 (file)
--- a/src/frame.c
+++ b/src/frame.c
@@ -3141,7 +3141,7 @@ x_set_border_width (f, arg, oldval)
 
 #ifndef MAC_OS
   if (FRAME_X_WINDOW (f) != 0)
-    error ("Cannot change the border width of a window");
+    error ("Cannot change the border width of a frame");
 #endif /* MAC_TODO */
 
   f->border_width = XINT (arg);